From aa267c1c8491c6199acddbcb93ce16e8e14dd5f9 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 1 Jun 2019 04:25:08 +0000
Subject: [PATCH] Add gtkmenubarprivate.h

Move private api into a private header.
---
 gtk/gtkmenubar.c        |  1 +
 gtk/gtkmenubar.h        |  6 ------
 gtk/gtkmenubarprivate.h | 43 +++++++++++++++++++++++++++++++++++++++++
 gtk/gtkmenushell.c      |  2 +-
 gtk/gtkwindow.c         |  2 +-
 5 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 gtk/gtkmenubarprivate.h

diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 6a6babc40f..970c98ed00 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -40,6 +40,7 @@
 #include "config.h"
 
 #include "gtkmenubar.h"
+#include "gtkmenubarprivate.h"
 
 #include "gtkbindings.h"
 #include "gtkmain.h"
diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h
index a319f85ff4..ee1d8a654a 100644
--- a/gtk/gtkmenubar.h
+++ b/gtk/gtkmenubar.h
@@ -49,12 +49,6 @@ GtkWidget* gtk_menu_bar_new             (void);
 GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_menu_bar_new_from_model  (GMenuModel *model);
 
-/* Private functions */
-void _gtk_menu_bar_cycle_focus (GtkMenuBar       *menubar,
-				GtkDirectionType  dir);
-GList* _gtk_menu_bar_get_viewable_menu_bars (GtkWindow *window);
-
-
 
 G_END_DECLS
 
diff --git a/gtk/gtkmenubarprivate.h b/gtk/gtkmenubarprivate.h
new file mode 100644
index 0000000000..5c910dfa6b
--- /dev/null
+++ b/gtk/gtkmenubarprivate.h
@@ -0,0 +1,43 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __GTK_MENU_BAR_PRIVATE_H__
+#define __GTK_MENU_BAR_PRIVATE_H__
+
+
+#include <gtk/gtkmenubar.h>
+
+
+G_BEGIN_DECLS
+
+
+void _gtk_menu_bar_cycle_focus (GtkMenuBar       *menubar,
+				GtkDirectionType  dir);
+GList* _gtk_menu_bar_get_viewable_menu_bars (GtkWindow *window);
+
+
+G_END_DECLS
+
+
+#endif /* __GTK_MENU_BAR_PRIVATE_H__ */
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 4ed273df34..eb3ef71135 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -65,7 +65,7 @@
 #include "gtklabelprivate.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
-#include "gtkmenubar.h"
+#include "gtkmenubarprivate.h"
 #include "gtkmenuitemprivate.h"
 #include "gtkmnemonichash.h"
 #include "gtkmodelmenuitem.h"
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index e6b928b7fd..1450873a45 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -56,7 +56,7 @@
 #include "gtkmessagedialog.h"
 #include "gtkmnemonichash.h"
 #include "gtkmenu.h"
-#include "gtkmenubar.h"
+#include "gtkmenubarprivate.h"
 #include "gtkmenushellprivate.h"
 #include "gtkpointerfocusprivate.h"
 #include "gtkpopoverprivate.h"
-- 
2.30.2